Merge up to commit 92e608bd0f3807314c45ee5f5daf6ba781c27d58 of gdm

Pull in a few fixes from gdm trunk for gdm-user.c

diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index e571a81d40ddbfb69d100d0620f5a5c748bd19e8..ffd57f94ac6ea802b0278dbd22edf5810267869d 100644 (file)
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -20,6 +20,7 @@
 
 #include <config.h>
 
+#include <float.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -881,7 +882,7 @@ curved_rectangle (cairo_t *cr,
         x1 = x0 + width;
         y1 = y0 + height;
 
-        if (!width || !height) {
+        if (width < FLT_EPSILON || height < FLT_EPSILON) {
                 return;
         }
 
@@ -1156,8 +1157,8 @@ gdm_user_render_icon (GdmUser   *user,
         } else {
                 pixbuf = NULL;
         }
- out:
         g_free (path);
+ out:
 
         if (pixbuf != NULL) {
                 framed = frame_pixbuf (pixbuf);